treewide: remove redundant stylix.image escaping and string coercion#2134
Conversation
MattSturgeon
left a comment
There was a problem hiding this comment.
Initial review from my phone, so hard to test or view full context.
835c1c7 to
949b4ec
Compare
949b4ec to
cb5ae97
Compare
Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
cb5ae97 to
c4ae2ea
Compare
MrSom3body
left a comment
There was a problem hiding this comment.
LGTM hyprlock still works
Coerce derivations to store paths to ensure non-null values are stringified store paths with valid string contexts. Fixes: 838df8b ("stylix: improve `stylix.image` type (nix-community#1414)") Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
Remove redundant shell escaping and string coercion as stylix.image is guaranteed to be a stringified store path with a valid string context and no special characters. Fixes: 3499e3e ("treewide: properly quote stylix.image when used as a shell argument")
c4ae2ea to
61c9f4d
Compare
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.11
git worktree add -d .worktree/backport-2134-to-release-25.11 origin/release-25.11
cd .worktree/backport-2134-to-release-25.11
git switch --create backport-2134-to-release-25.11
git cherry-pick -x 3f6651a26e0127654e6b24a3616239e2eaaf392b ca1bc329e91039435450d19c0e31655c1efd3f0f 61c9f4dd1435e0723fe675d44459a88b9203418d |
|
I think this commit may have broken something for me. Now getting: |
What is your stylix/stylix/testbed/images.nix Lines 3 to 26 in 590e5c6 |
|
In your case, you're defining a path-like string, not an actual path that can be copied to store. For most users, referencing a path outside of your config via a string would be a subtle bug, but the option type could be relaxed to accommodate these (non-path, non-drv) path-like strings and assume they are already present in the resulting system, without creating a proper dependency on the file. |
|
To preserve the original behaviour, (
coercedTo path (p: "${p}") path
// {
description = path.description + ", copied to store if possible";
}
) |
As mentioned in #2134 (comment),
With #2150, it would be better to consider the store copying aspect as an implementation detail that is irrelvant to end-users, especially because the store copy cannot be guaranteed. |
Uh oh!
There was an error while loading. Please reload this page.